From 881ccf560be4158673d254124504ee95ce87658c Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 14 Apr 2014 00:00:57 +0000 Subject: [PATCH] Final (?) changes for 1.5.0 release. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4809 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/configure | 24 +++++++++++++----------- gpsbabel/configure.in | 10 +++++----- gpsbabel/gbversion.h | 4 ++-- gpsbabel/gui/gpsbabelfe.ts | 10 +++++----- gpsbabel/gui/gpsbabelfe_de.ts | 10 +++++----- gpsbabel/gui/gpsbabelfe_es.ts | 10 +++++----- gpsbabel/gui/gpsbabelfe_fr.ts | 10 +++++----- gpsbabel/gui/gpsbabelfe_hu.ts | 10 +++++----- gpsbabel/gui/gpsbabelfe_it.ts | 10 +++++----- gpsbabel/gui/gpsbabelfe_ru.ts | 10 +++++----- 10 files changed, 55 insertions(+), 53 deletions(-) diff --git a/gpsbabel/configure b/gpsbabel/configure index 41d73a253..7a14fa7ec 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.0-beta20140302. +# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.0. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GPSBabel' PACKAGE_TARNAME='gpsbabel' -PACKAGE_VERSION='1.5.0-beta20140302' -PACKAGE_STRING='GPSBabel 1.5.0-beta20140302' +PACKAGE_VERSION='1.5.0' +PACKAGE_STRING='GPSBabel 1.5.0' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' PACKAGE_URL='' @@ -1283,7 +1283,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GPSBabel 1.5.0-beta20140302 to adapt to many kinds of systems. +\`configure' configures GPSBabel 1.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1349,7 +1349,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GPSBabel 1.5.0-beta20140302:";; + short | recursive ) echo "Configuration of GPSBabel 1.5.0:";; esac cat <<\_ACEOF @@ -1449,7 +1449,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GPSBabel configure 1.5.0-beta20140302 +GPSBabel configure 1.5.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1765,7 +1765,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GPSBabel $as_me 1.5.0-beta20140302, which was +It was created by GPSBabel $as_me 1.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2113,12 +2113,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +DOCVERSION=1.5.0 + # YYYYMMDD, please, if beta, i.e. "-beta20060413" -DOCVERSION=development +#DOCVERSION=development # Increase GBBUILD for a new release (why? Where is this ever used?) -GBBUILD=25 +GBBUILD=26 # PACKAGE_RELEASE="-beta20140216" cat >>confdefs.h <<_ACEOF @@ -5475,7 +5477,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GPSBabel $as_me 1.5.0-beta20140302, which was +This file was extended by GPSBabel $as_me 1.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5537,7 +5539,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GPSBabel config.status 1.5.0-beta20140302 +GPSBabel config.status 1.5.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index b6fa40715..48b7cb8c1 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -3,16 +3,16 @@ AC_PREREQ(2.59) -#AC_INIT(GPSBabel, 1.4.4, BUG-REPORT-ADDRESS) -#DOCVERSION=1.4.4 #PACKAGE_RELEASE= -AC_INIT(GPSBabel, 1.5.0-beta20140302, BUG-REPORT-ADDRESS) +AC_INIT(GPSBabel, 1.5.0, BUG-REPORT-ADDRESS) +DOCVERSION=1.5.0 + # YYYYMMDD, please, if beta, i.e. "-beta20060413" -DOCVERSION=development +#DOCVERSION=development # Increase GBBUILD for a new release (why? Where is this ever used?) -GBBUILD=25 +GBBUILD=26 # PACKAGE_RELEASE="-beta20140216" AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) AC_SUBST(PACKAGE_RELEASE) diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h index 4878d907f..1e76ccc98 100644 --- a/gpsbabel/gbversion.h +++ b/gpsbabel/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.5.0-beta20140302" -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development" +#define VERSION "1.5.0" +#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.0" diff --git a/gpsbabel/gui/gpsbabelfe.ts b/gpsbabel/gui/gpsbabelfe.ts index 0aebaa01a..d08ea6006 100644 --- a/gpsbabel/gui/gpsbabelfe.ts +++ b/gpsbabel/gui/gpsbabelfe.ts @@ -770,28 +770,28 @@ This program cannot continue. - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active diff --git a/gpsbabel/gui/gpsbabelfe_de.ts b/gpsbabel/gui/gpsbabelfe_de.ts index f075dd989..03a2bee38 100644 --- a/gpsbabel/gui/gpsbabelfe_de.ts +++ b/gpsbabel/gui/gpsbabelfe_de.ts @@ -598,28 +598,28 @@ Das Prgramm muss abgebrochen werden. Konvertierung erfolgreich - + Error running gpsbabel: %1 Fehler beim Aufruf von gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Sind Sie sicher, dass Sie alle Formatoptionen auf die Vorgaben stellen wollen? - + About %1 Über %1 - + One or more data filters are active Einer oder mehrere Datenfilter sind aktiviert - + No data filters are active Keine Datenfilter sind aktiv diff --git a/gpsbabel/gui/gpsbabelfe_es.ts b/gpsbabel/gui/gpsbabelfe_es.ts index a3bcf6a17..709ea056b 100644 --- a/gpsbabel/gui/gpsbabelfe_es.ts +++ b/gpsbabel/gui/gpsbabelfe_es.ts @@ -641,28 +641,28 @@ This program cannot continue. Traducción realizada con éxito - + Error running gpsbabel: %1 Error ejecutando gpsbabel: %1 - + Are you sure you want to reset all format options to default values? ¿Estás seguro de que quieres volver a los formatos por defecto? - + About %1 Acerca de %1 - + One or more data filters are active Uno o más filtros de datos están activos - + No data filters are active Ningún filtro de datos está activo diff --git a/gpsbabel/gui/gpsbabelfe_fr.ts b/gpsbabel/gui/gpsbabelfe_fr.ts index db4228700..3d24748f1 100644 --- a/gpsbabel/gui/gpsbabelfe_fr.ts +++ b/gpsbabel/gui/gpsbabelfe_fr.ts @@ -580,28 +580,28 @@ This program cannot continue. - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active diff --git a/gpsbabel/gui/gpsbabelfe_hu.ts b/gpsbabel/gui/gpsbabelfe_hu.ts index c49f9286b..26b64b1cd 100644 --- a/gpsbabel/gui/gpsbabelfe_hu.ts +++ b/gpsbabel/gui/gpsbabelfe_hu.ts @@ -580,28 +580,28 @@ This program cannot continue. - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active diff --git a/gpsbabel/gui/gpsbabelfe_it.ts b/gpsbabel/gui/gpsbabelfe_it.ts index 87d168f22..845d096f2 100644 --- a/gpsbabel/gui/gpsbabelfe_it.ts +++ b/gpsbabel/gui/gpsbabelfe_it.ts @@ -800,29 +800,29 @@ Questo programma non può proseguire. Traduzione terminata con successo - + Error running gpsbabel: %1 Errore durante l'esecuzione di gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Si è certi di voler reimpostare tutte le opzioni dei formati ai valori predefiniti? - + About %1 Informazioni su %1 - + One or more data filters are active È attivo uno o più filtri di dati - + No data filters are active Nessun filtro di dati è attivo diff --git a/gpsbabel/gui/gpsbabelfe_ru.ts b/gpsbabel/gui/gpsbabelfe_ru.ts index 876b31b2b..751ec2a71 100644 --- a/gpsbabel/gui/gpsbabelfe_ru.ts +++ b/gpsbabel/gui/gpsbabelfe_ru.ts @@ -798,28 +798,28 @@ This program cannot continue. Конвертация выполнена - + Error running gpsbabel: %1 Ошибка запуска gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Вы действительно желаете сбросить все параметры формата в значения по умолчанию? - + About %1 О %1 - + One or more data filters are active Один или более фильтров данных активны - + No data filters are active Фильтры данных не активны -- 2.30.2